Alternative logic proposition

See comments in the code