Changes  based on testcases