should i keep underscore at this point?