add changes as suggested by cheddar