Reverted to old version. previous changes broke everything