less clutter/works for testing now