some old changes, think they are keepers! ;)