changed some things, take 2