changed some things at the top