JustArchi's Optimiziations with compatibility of the normal Optimizations

P.S.2 Update it for callfix.

Change-Id: Ic1e4c78e3ce207300f8bbb7294b370479d7f6d46