bug fixing and hint changed