Made many changes