tackling more function issues