Function method improvement