MADE A LOT OF CHANGES