7a05c29 various changes