Converted to using Home folder instead of specified folder