STILL NOT WORKING
+ more simplifications