imrpove responsiveness slightly