change to newest way

..