flax

f1697b37 - Incorporate changes from code review