Updates and formatting for new functions