version without dumb shortcuts