Changed name
seperated code into methods