[fix] reworking some parts