Should be ok now with upload class.