changes to deal with double operator