removing sol 5 untile refactoring