out with the old and in with the new
merged with patrick