getting close...cleaned up conditional bindings