Updated according to feedback #52.