Change this to not take object anymore.