some updates to make appropriate to challenge