Updated to read from folder