few tiny modifications