Fix the bug and funtions to get with params