config and main changes