minor changes, edited directly in github, check later,