moved some items around