added alot of stuff!