Bug/status case

Please Review and Compare