much better fix to adding organization