Added bucket fill and Q exits