REF: better use of existing code