added some objects manipulation logic