final commit by Westin