More edits - need to separating..