update .. changed a few things!