ADDED constructor and removed unused classes