Give more semantic class + make it global
Match new class
Give more semantic class + make it global