moved some #defines