Change in some functions for more utility