Tidied up for FEN-20/21/61