Both endpoint now take width parameters