Expander Class update from THursday