Edited version from ahmed

11-26-2014 - for deployment
- with audit trail