New version with some updates