adapted some specs