Added some hit or stay logic