started shield fixing WIP