Changed GST calc