Improved water functionality -- vertex scaling