more correct code