new version with two types for stations