corrected identation and added method from merge