deleted unnessesary/repeated code