fixed things for ramon
Made some fixes, implementing splitting