adds changes, following Coding Guidelines