fix integrated with previous script