Added Jeffrey's code. Still not working.
Resolving conflicts