Changed options to long form and rearranged get order