--Fixing Glue Code incomplete part1