More updates for sprint 37