Refining earlier work

found a work i did for a client pretty long time ago, decided to change the whole thing