changed method order