Fixed functions file