Commented out note issue, will fix later today