Some stuff added