Converted more glenz code