Updated paths etc.