[PARTIAL] readjusted frontend