Tweaked for display and screenshots