Dmitry's GPM patches