Pre branch
code refactored