all updated all working but next occurance not tested/implemented