reworking some routes