castle setup needs fixing