Minor tinkering
Further modifications