Leger refactor