Better handling of notices, email updated with define_content
better