bring in p500 changes