UPDATED format and simplified