Needs to work on response time