Michael Jablin's changes