some more glue changes