Updated with full station method