Rewritten class