Code Change( made more simple)