Some updates from other version