added lines 2a and 2c