running version bevor tidiing up