Logic completed