First working version with simplified plots