updated version without errors