some changes

Hey these changes are *very important*!