revamp part 2
fix case issue
fix case
fix case
push some more