Need fix the software list and forms