updated functionality, routing issues