Modifications: Set 2

Modifications: Set 2