Fixed issue with multiple bindings

Fixed multiple bindings issue and consolidated merge with Mark's branch.