Added armed flag and changed options application