Moved more code over from Lilian