update

remove regexp and added worldname