Tweaking logic
Tweaking logic