minor change
some moving arround