section 3.3 advances + fix #41