added small api changes, and added more safety than just only slabs!