refactoring, few new things started