Final commits from cfg
Final changes for cfg