Updated so no double linking headers