Adding changes from Ceall