refactoring sites: NOT FINISHED YET