nigel/liz fixing build