6.3 rewriting again to remove queue