Sabees changes

Some line changes made by sabee