changes from brainsonic-dev