Added controllers & modified orgcont