Cool new feature (zinahe)

Added a new cool feature.