cleaned up, adding modal