changing to standard convention