Fix filename
Fix bug and change function name