reverted some of the changes i(valentine) made