updated bugs and new format