station and company issues
after merge