some stuff remaining... just backing up the changes