Added robust version of sonar