SO MANY MINOR CHANGES