Changes as suggested by steve