ENH: reverted to older api, more consistent. Matlab compatibility works