Change object relationships slightly - now works a bit more logically