updated with figures

still WIP