minor changes urghhh