preparing to add diff functionality