beta 0.5

refactoring