Changes for Implementation

Also Option A