Added changes suggested by tsuna