Signs fixed and merged with nics code