added config and includes