shield model + fixes