stable edition with untested changes due to api timeout