Second commit, with ArrayQueue