minor changes :-P