committing for backup
Seems to work
about to test
fix this bug