update to camelots main class