updated files and config for 2.3