Updated solution to support build b73