Redone 3618, should be final