Applied PR suggested by David