Code Fixes,Construct, etc
Moved function