Better Code, Trying to merge