This function is not static anymore