Rift logic broken, reorder

Submitted-by: Chris Thompson (mm0zct)