new fix
final changes, still ERROR