change the way we handle app options