let my osd take over and cleaned up some code