Completed #Story11 and Resolved #6