Fixed sensors

Using prebuilt ones
Thanks Zasuk