fixes for organization and sec define