Incorporate alex's review comments (sensor feeds)