@tharax did this awesome enhancement