Reverted to old implementation