Fixed creeps being in wrong order and merged both branches