Latest changes + added a_modal module