[#189] added disable class and other things