now working with folder checking