merged changes, and removed unnecessary binds. Need to validate if everything still works OK.