Dropped the old implementation