Tweeks and added queue mechanism