Updated super, added download option, cleaned up code