moved alert and changed message