Some more refactor before changing everything for placing