back on track with all same changes