scheme3 & scheme5

Change-Id: I724f4635c5beeb813b2954b82a245047031439f1