(Finish)Separate type using number

Please check it again