More changes based on @octo's input