Fix bug, add new func