Added second function
Fix conflict