Merged with Geraldine's code