refator to include funding