removed else since values are already set