Major update to main version