Changed and fixed something--Jashon Wan