refactor and full stations