added version check!