Adding function back in