Eva's fixed code