merged with newspring core