Implementation Tweaks