updates-castle cleaned up