WIP: placing optimizations
Some modifications