updated to include castle