Little improvement for something big
Method for functions
Fixed