fixed some bad assumtions