Incorporated aturon's review feedback.