I'll fix some things that were done wrong