Better plan (40/47)

Better plan