More awesome changes...
merged edits