Added more variables to close #1.