Updated CAquarium and CDirt