refactoring online, sink partially fixed