remaking changes now that I synced...