New way of working, this works and is fast too :)