Buncha changes for testing