forward/backwards compatibility commit