V7Beta3 Additions

Change-Id: I7b74a55b5e95984a3d5ebbf250a9630e71a4a5c3
Fixed C&VG SAVE THE PRINCESS

Change-Id: I71e385215cf90561e134de8bfc51b42601f3afbb