modified to 1 and 3