Almost done
Fixed method selection