STILL BROKEN a few changes