V1.1 refactor