Initial solution is working