more changes
forgot some spacing changes