Reafctor + adding forms