FIX: forgot to remove debuging halt