removing sol 6 untile refactoring