some more final work