Fixed org specs
Working on client specs