Debugged some functions

Signed-off-by: pris <priscilla.ngsc@gmail.com>