Some changes to work on both stations