Changed implementation of Status