Started to split code