- improved and cleaned up glue adapter structure