Reduced crashing, added lazy polling