Added all current code
Merge fix