Added more code for testing