Some update from Craigs feedback