Second batch of changes - 2

Second batch of changes - 2