udpated: spec and helper updated for latest version.