Updated A few things