fixed namespace bug, and added more involved lines