updated for sprint 38