This is how I shouldve done it the first time