removed testing code; should work now