Changed FW-entry

closes #495