More work on castle map