removed unnecessary import and new class format!