Added some sword specific changes.