put candlepath stuff back