updated to be 2-1-stable compatible