STY: refactor to bring up to date