Change to pointer

Also added StringBuffer