last changes for full and compact 0.2