Draft bill for new funding formula