swapping

Making new as default and moving old default to old, this is kept for
tracking, will be removed in the future