0021 implement hot-loading