updated with more stuff!