Draft implementation before using split stone
Fixes to use split stone