added some extra 'echo' statements