updates to non bin
issues with merge