Completed #Story3 and Resolved #5