Changed to compact format