Updates following testing