adjustments to make the source fields functional