fixing bugs v1.1 for production
resolve merg conflict
final v2