final commit for the night. Fixed problems with previous random change