Removed redundant stuff and added third party options.
Updated version