updated to include form for GUI