Refactoring basis

Last updated