Update based on feedback from Rox