updated for summer 2015