Revert "Finals"

This reverts commit d8f66cfab21d3fb38f2c5e3894082491b5fb6059.
final v1.1
Final v1.2