Added ability to reset attributes
merged