deck changed, moved into proper formats