Continuing work on WebSharks/s2Member#146