Raymond's second commit