previous commit + loader implement restore