Added support for old version, bugs in options selected