removed unnecessary conversions;