Merge fix
Merge fix
Deleted idea