Fix Issues
Merge codes
Merge code updates