updated with proper classes