* moved to redis
* simplified code dramatically