V2.0.1 Added greater functionality