cosmetics + add basic func