brought updates from full version