Added some newer functions for testing