changes based on jan's comments