Thanks blha for updating the class