Switch to #[#] per code review