Advanced Watershapes