Generalised the second command (accidentally left '242 related code in)