added Remove class and other major things