updated from comments