removed some broken code... still not tested though