Removed hard-coding, added arg for imagename