Updated to comply with validator trial1