Working version small changes