Fixing initial code