added a few #defines