nice modifications, better urling