Talent macro added
Big clean up