modifications to get rid of config file
fix
fix2