Implemented Francois' suggestions.