Few more optical changes