Polish everything and add a proposition