charts and exceptions added