Changed some method order