Committing proper funf
Seems to allow combo sensors
Hopefully resolving conflicts