Updated Design and implemented some scripts