added entities and partial movement