Following standard tested on Atlas