More repeated functions added