Major improvements implementation