Made status method more efficient