updated for josh