incorporated daniels twitter tweaks that were overwritten in git confusion