Added client side, removed file copying