Edited some code...