Added mona, changed a few things