changed conversion values, added break statements