Updated to comply with validator trial2