FINAL PUSH at least for class