added journaling and stuff