Switching over to simpler solution.