added missing features.