Added Status check