Updated forms based on feedback from Marianne