Today's changes. Trying to fix travis cl :/