#001 Some changes for testing purpose