updated few functions