Omar

Updating master with my changes. Waiting for merge from Ben branch.