Endpoint now handles better interfaces going up and down in relation to swift