Tweaking, making sure data is properly exposed