Modified for testing purpose