Wrapper script modified