added all the other cool stuff