reenabled some stuff