changing some exposed logic