Updated to make it more generic (the same as Yokohama)