refs #2 Fixed implemantaions