Finished incorporating Ernestos feedback.