Latest Changes with sensor code modification