Fixed_further_implementation_problems #233