Refactored to use omxcontrol