Re-wrote binder code, more concise.