More logic implemented