Added singleUnit status detection back in