Updated for things that has happened
Cleaned up whitespace