a few changes to 1 through 4