Josh's changes and price stuff