Some stuff needs updates