Changed to fulfil GR-4