Completed #Story53 and Resolved #98