Update and impovments