Changed constants to int from String