Changed folder path and a bug