working on the bug fix. Currently migrated models