1.3 refactor, for ease of 1.4