Changed to fit Class Examples