Modified to use newly added shell-scripts