Added option for testing