Adjusted input sizes, removed sample information