code simplification
Merge branch 'beta' into beta-ics