+ Added ability to choose between + and ,