Before split out the old code
after cleanup