Updated to newest Tomsik68 API