Enhance response time & windows bugfix