Updates to Candlesticker