changes
merge fix
fixed compares