Improve object seperation etc