New modularized actions almost ready