CHANGE: Changes / Fixes / new functions for compatiblty