Some changes for issue #3