removed all the @ prefixes for attributes, extra functionality back