Incorporate feeback from Luke and Rob into def