Minor changes + SRPG