Updates by CleanKore

CleanKore