First part of the overhaul of the contribute section