added new feature (with a bug)