Updated func signature