removed headers added exceptions