removed aaap
removed custom
added config
added config
integrating