Removed a few lines, but nothing much should be different