Added some special cases
Added some special cases