Made parameters separate for clustering and normal run <Karthik>