Corrections to simplify the architecture