Changed method names and var names