R&D

Updates

Support for heavy sinks