updated code for icehouse