pend changes + fix