Edited some more