simplifying endpoints greatly