[UPDATE] refactor + legend