Review Alex's changes, LO-661 and LO-280