Added another new feature (while needs to be fixed)