Fluid update for Base.java