Updated for new features - format