Modifed a few things