added more formattign