fixed offer new and removed messages due to messyness