Minor Changes
Attributes broken