upated and merged for Epoch 1.0.4