scheme3 & scheme5

Change-Id: I6a0e35de84d7d4af234761330af21b573bb24e43