setSource method tweaks