class availability code merge