Incorporate feedback from Luke and Rob into def