Use dot instead of source
Bring latest changes from Gary