Merge time -- cleaned up now