Almost function def
Fix merge