Updates for use with sprint28