Okay stay needs improvements