More work on gem