some tiny modifications