few other modifications