Added settings, code recontructions