first entry transfers & refactoring