still some bugs... but removing works