State reset working again