More logic organization