Life indicator logic added