Tweaking data only implementation