bug/2 feature/3