Updating branch 3a to have 1e stuff