Commit: update for less loading time