compiled those last changes to make it public