Added option to not save scores