Modified for V2.0 Ui and more fnctionality included