Change in method name, clean up