refactor to use layers names as leading