updates to #defines