got it working under this new code architecture
commit before power down