Major changes for Kloster form