Updated content on acts.
merge with fixed conflicts