FIXED SHU'S BUGS