Some stuff I had to add