Final commit
Fix pass by ref issue