Changed method order