Some modifications. Still same problem