updated to 1.2 spec support