Added dual sensor support
Updates to fix errors