Fixed the code until evaluation