updated with full migration specs
cleaned up current logic