cleaned up
Migrated code from ABM condition into master branch