Added better functionality to skills