Modified it some more