Speacil cases

Change-Id: I98553adc4699046f8348b3f5d8f61d0c97466e8d