Some edits before starting on transactions