Changed a few stuff here and there