Tweaks, added part of user timeouts