More work on station creation