updated organization controller