fix bug
change arrival system