added version handling