removing alternate version
refactoring