Now using absolute paths
Some changes