Followed the spec more precisely, for the activities to come.