Issue211

this needs to be inside the data block