version 1.5.2 / replaced class with id