Re-arranged method order