added default values to two functions