Added Self-Reset functionality