Added Fluids and added Form-Self Effect