Performance inprovement and options added