Second pass at QFJ-802

Signed-off-by: Stephen Flynn <stephen.flynn@jftechnology.com>