A few Changes ;-)