Complete Update and redesign