Cosmetic changes, getting ready for collisions and states