Reworking started on SPIP