completely replaced everything to stuff about liquid