Edit - new method finished