Simplified Code
added Classes