New version with simplified stuff