Edited some code