added to #14 refactor