fixes #1 - initial commit for the migrated codes