Re-design of hw3