fixes for troy and josh