updated

with better formatting