Update to lastest features after bad merging