Pushing contributions from Omar to the repo