updated to use last version on Q and QBase