Updated code to support upto 15 characters