Review

Some changes for your review