Various Updates (3/3)

not sure if virtual sensors can start to work with this change 
anyway give it try :)