Updated with toastr