Käynnissä

expend component with some new features and fixing a bug