Fixed message to show name of org
Merged all the shizzes