removed puts statements
added rescue block
added fields