some change on format program, time fixed