basic changes made for calc attrs
checkpoint