merge of sonik-1 with rest