codes update in progress
merge
fix quote