Issue 145

pplns still needs fixed