Add changes suggested by @ahojnnes