simplified by removing unnecessary session and autorun