Mid Refactor update