Completed Tasks #115 #123 #129