Add more to gi