Updated for epoch 1.0.4.2