working on changing format