--Updated glue code and deleted test button