updates to remove q