Making the whole thing more fluid