Updated to avoid using .cfg files.