Not tested yet, gonna do updates later, suggested by

@syrix