Updated Castle WIP