Completed #Story5 and Resolved #3