updated to remove conf usage