Added functionality for basic points