Added more functions for testing