testing on my local machine
Some changes due to new research