updated for GUI dev