Added 2-nd class